From 5d46b4c6361eb0c043a4d0bd0f26f2a248e487b4 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Thu, 14 Dec 2006 15:32:44 +0000 Subject: [PATCH] Fix calls to destroyDevice that are missing a force flag. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/server/DevController.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/xend/server/DevController.py b/tools/python/xen/xend/server/DevController.py index aa96e323ce..6ac7885036 100644 --- a/tools/python/xen/xend/server/DevController.py +++ b/tools/python/xen/xend/server/DevController.py @@ -155,13 +155,13 @@ class DevController: status = self.waitForBackend(devid) if status == Timeout: - self.destroyDevice(devid) + self.destroyDevice(devid, False) raise VmError("Device %s (%s) could not be connected. " "Hotplug scripts not working." % (devid, self.deviceClass)) elif status == Error: - self.destroyDevice(devid) + self.destroyDevice(devid, False) raise VmError("Device %s (%s) could not be connected. " "Backend device not found." % (devid, self.deviceClass)) @@ -180,7 +180,7 @@ class DevController: if not err: err = "Busy." - self.destroyDevice(devid) + self.destroyDevice(devid, False) raise VmError("Device %s (%s) could not be connected.\n%s" % (devid, self.deviceClass, err)) -- 2.30.2